[IA64] avoid spurious XENBUS error

Create just as many LSAPIC entries in MADT as the number of cpus.
This avoids spurious XENBUS errors when kernel try to read xenstore entries
for cpus unknown by xend/xenstore.

Signed-off-by: Tristan Gingold <tristan.gingold@bull.net>

diff --git a/xen/arch/ia64/xen/dom_fw.c b/xen/arch/ia64/xen/dom_fw.c
index df6cfca77ee46b94040adb0517e1165a5a193b12..40b7ce11958bd7e40e7f02eee18e4b8c54fddc68 100644 (file)
--- a/xen/arch/ia64/xen/dom_fw.c
+++ b/xen/arch/ia64/xen/dom_fw.c
@@ -342,6 +342,7 @@ dom_fw_fake_acpi(struct domain *d, struct fake_acpi_tables *tables)
        struct acpi_table_lsapic *lsapic = tables->lsapic;
        int i;
        int aml_len;
+       int nbr_cpus;
 
        memset(tables, 0, sizeof(struct fake_acpi_tables));
 
@@ -452,8 +453,6 @@ dom_fw_fake_acpi(struct domain *d, struct fake_acpi_tables *tables)
        /* setup MADT */
        strncpy(madt->header.signature, APIC_SIG, 4);
        madt->header.revision = 2;
-       madt->header.length = sizeof(struct acpi_table_madt) +
-               MAX_VIRT_CPUS * sizeof(struct acpi_table_lsapic);
        strcpy(madt->header.oem_id, "XEN");
        strcpy(madt->header.oem_table_id, "Xen/ia64");
        strcpy(madt->header.asl_compiler_id, "XEN");
@@ -461,15 +460,20 @@ dom_fw_fake_acpi(struct domain *d, struct fake_acpi_tables *tables)
                xen_minor_version();
 
        /* An LSAPIC entry describes a CPU.  */
+       nbr_cpus = 0;
        for (i = 0; i < MAX_VIRT_CPUS; i++) {
                lsapic[i].header.type = ACPI_MADT_LSAPIC;
                lsapic[i].header.length = sizeof(struct acpi_table_lsapic);
                lsapic[i].acpi_id = i;
                lsapic[i].id = i;
                lsapic[i].eid = 0;
-               lsapic[i].flags.enabled = (d->vcpu[i] != NULL);
+               if (d->vcpu[i] != NULL) {
+                       lsapic[i].flags.enabled = 1;
+                       nbr_cpus++;
+               }
        }
-
+       madt->header.length = sizeof(struct acpi_table_madt) +
+                             nbr_cpus * sizeof(struct acpi_table_lsapic);
        madt->header.checksum = generate_acpi_checksum(madt,
                                                       madt->header.length);
        return;